Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge the history of Solidus PayPal Braintree into this repository #98

Merged
merged 801 commits into from
Jan 12, 2023

Conversation

gsmendoza
Copy link
Contributor

@gsmendoza gsmendoza commented Jan 6, 2023

Summary

Resolves #92.

Implemented with

git remote add solidus_paypal_braintree [email protected]:solidusio/solidus_paypal_braintree.git
git reset --hard solidus_paypal_braintree/master
git merge origin/master --strategy ours --allow-unrelated-histories

Screenshots

Looking at the git history, the SolidusBraintree commits appear after the SolidusPaypalBraintree commits. However, the resulting code after the merge is the code from SolidusPaypalBraintree.

image

image

Checklist

Check out our PR guidelines for more details.

The following are mandatory for all PRs:

  • I have written a thorough PR description.
  • I have kept my commits small and atomic.
  • I have used clear, explanatory commit messages.

The following are not always needed (cross them out if they are not):

  • [ ] I have added automated tests to cover my changes.
  • [ ] I have attached screenshots to demo visual changes.
  • [ ] I have opened a PR to update the guides.
  • [ ] I have updated the README to account for my changes.

kennyadsl and others added 30 commits November 17, 2018 11:58
Sometime this produces an error in the suite dependant on the order
specs run since that ID is already taken in previous test and database
cleaning does not clear primary keys increment value. The error was:

ActiveRecord::RecordNotUnique:
       Mysql2::Error: Duplicate entry '11' for key 'PRIMARY' ...
it reached EOL and it is failing
This reverts commit 997301e.

ApplePay and PayPal sources actually have some informations, they just are
different than credit cards.
When the customer closes the PayPal popup before completing the payment
process a PAYPAL_POPUP_CLOSED is received. The message is now properly shown
to the customer.
This is needed to use `enableShippingAddress: false`.
Solidus tries to present reusable payment sources to customers from
their wallet. Subscriptions can cause a non-reusable payment source to
be added to the user's wallet. We need to prevent that source from being
made available to users, since the nonce will almost certainly fail.
Check for rails-ujs object when re-enabling button
Make nonce-only payment sources non-reusable
The solidus_paypal_braintree does not provide an API view for their
payment sources, which causes errors in the admin panel and when
using the API.

See solidusio/solidus_paypal_braintree#167.
Add API payment source view for Braintree payments
* Add Solidus v2.8
* Remove Solidus v2.3
FactoryBot v5.0 defaults `use_parent_strategy` to true, which builds
(rather than create) associations, which was causing several specs
to fail.
SQLite3 v1.4 was released on February 4th, which breaks compatibility
with ActiveRecord's adapter for said DB engine.
Add byebug as a development dependency for debugging during development
and testing.
Add association on the spree user model to associate it with the
braintree customer model.
elia and others added 21 commits November 18, 2022 18:32
Since Rails 7, it's no longer possible to reference a loadable
constant on the initialize phase [1]. We need to wrap the setup within
a `to_prepare` block, as it's already documented on our guides [2].

1 - https://guides.rubyonrails.org/autoloading_and_reloading_constants.html#autoload-on-boot-and-on-each-reload
2 - https://guides.solidus.io/advanced-solidus/model-preferences#static-preferences
To be clear that it's currently not working with the new starter frontend
This pulls the fix from upstream (solidus_dev_support).
- solidusio/solidus_dev_support#192
Because this extension decorates the User class, the original User class
must be loaded before the decorator, otherwise the sandbox migrations
fail. To fix this, solidus_auth_devise will be listed in the Gemfile
before extension.

The `--with-authentication` flag will still be given to the Solidus
generator so that includes solidus_auth_devise' seeds, however, Solidus
will not install it twice.
https://github.com/solidusio/solidus/blob/efe2b3a20d0577413e4810c008ea564e637c36a3/core/lib/generators/solidus/install/app_templates/authentication/devise.rb
`--with-authentication` is deprecated in favour  of `--authentication`.
Note, the former chose "solidus_auth_devise" if `true` was given.
This drops support for Solidus version <= 2.3, and stops a deprecation
warning from happening when running the Gem under current Solidus
versions.
Provide a link to find more information about PayPal styling and help
developers realize that even though a funding source may be available,
it may not be shown due to the button limit of paypal_button_layout.
Useful for when integrating fraud protection tools that need this data.
…clude

Do not safeguard including of Spree::Preferences::Persistable
…g-information

Improve README PayPal styling information
Add BIN (bank identification number) to SolidusPaypalBraintree::Source
…nt-class

Drop compatibility with Solidus < 2.4
Make it match the defaults coming from dev-support.
Also normalizes a few things to better match the defaults coming from
dev-support.
Update to the latest dev-support defaults
@gsmendoza gsmendoza self-assigned this Jan 6, 2023
@gsmendoza gsmendoza marked this pull request as ready for review January 6, 2023 09:19
@gsmendoza gsmendoza requested review from kennyadsl and elia January 6, 2023 09:22
@gsmendoza gsmendoza force-pushed the gsmendoza/92-merge-solidus-paypal-braintree branch from e0e5802 to 55d1b7b Compare January 9, 2023 06:25
Copy link
Member

@elia elia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$ git diff HEAD paypal_braintree/master --stat # returns nothing

@gsmendoza gsmendoza merged commit a5936c4 into master Jan 12, 2023
@kennyadsl kennyadsl deleted the gsmendoza/92-merge-solidus-paypal-braintree branch March 20, 2023 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge the history of Solidus PayPal Braintree into this repository